| 
                
               | 
              
                
               | 
              
                @@ -41,19 +41,19 @@ def tj_distributor(request): 
               | 
            
            
            
              | 
                41
               | 
              
                41
               | 
              
                     # sale_trends = [s.data for s in sale_trends] 
               | 
            
            
            
              | 
                42
               | 
              
                42
               | 
              
                  
               | 
            
            
            
              | 
                43
               | 
              
                43
               | 
              
                     # 型号销量统计 & 热销商品榜 
               | 
            
            
            
              | 
                44
               | 
              
                
               | 
              
                -    model_sales = ModelSaleStatisticInfo.objects.filter(brand_id=brand_id, ymd=0, status=True).order_by('-num')
               | 
            
            
            
              | 
                
               | 
              
                44
               | 
              
                +    model_sales = ModelSaleStatisticInfo.objects.filter(brand_id=brand_id, ymd=ymd, status=True).order_by('-num')
               | 
            
            
            
              | 
                45
               | 
              
                45
               | 
              
                     model_sales = [m.data for m in model_sales] 
               | 
            
            
            
              | 
                46
               | 
              
                46
               | 
              
                  
               | 
            
            
            
              | 
                47
               | 
              
                47
               | 
              
                     # 经销商销量统计 & 经销商榜 
               | 
            
            
            
              | 
                48
               | 
              
                
               | 
              
                -    distributor_sales = DistributorSaleStatisticInfo.objects.filter(brand_id=brand_id, ymd=0, status=True).order_by('-num')
               | 
            
            
            
              | 
                
               | 
              
                48
               | 
              
                +    distributor_sales = DistributorSaleStatisticInfo.objects.filter(brand_id=brand_id, ymd=ymd, status=True).order_by('-num')
               | 
            
            
            
              | 
                49
               | 
              
                49
               | 
              
                     distributor_sales = [d.data for d in distributor_sales] 
               | 
            
            
            
              | 
                50
               | 
              
                50
               | 
              
                  
               | 
            
            
            
              | 
                51
               | 
              
                51
               | 
              
                     # 各地区实时销量 
               | 
            
            
            
              | 
                52
               | 
              
                
               | 
              
                -    province_sales = ProvinceSaleStatisticInfo.objects.filter(brand_id=brand_id, ymd=0, status=True).order_by('position')
               | 
            
            
            
              | 
                
               | 
              
                52
               | 
              
                +    province_sales = ProvinceSaleStatisticInfo.objects.filter(brand_id=brand_id, ymd=ymd, status=True).order_by('position')
               | 
            
            
            
              | 
                53
               | 
              
                53
               | 
              
                     province_sales = [p.data for p in province_sales] 
               | 
            
            
            
              | 
                54
               | 
              
                54
               | 
              
                  
               | 
            
            
            
              | 
                55
               | 
              
                55
               | 
              
                     # TOADD: ROI 
               | 
            
            
            
              | 
                56
               | 
              
                
               | 
              
                -    rois = ModelSaleStatisticInfo.objects.filter(brand_id=brand_id, ymd=0, status=True) 
               | 
            
            
            
              | 
                
               | 
              
                56
               | 
              
                +    rois = ModelSaleStatisticInfo.objects.filter(brand_id=brand_id, ymd=ymd, status=True) 
               | 
            
            
            
              | 
                57
               | 
              
                57
               | 
              
                     rois = [m.roi for m in rois] 
               | 
            
            
            
              | 
                58
               | 
              
                58
               | 
              
                  
               | 
            
            
            
              | 
                59
               | 
              
                59
               | 
              
                     return response(200, 'Get TJ Data Success', u'获取统计数据成功', {
               | 
            
            
            
            
            
              | 
                
               | 
              
                
               | 
              
                @@ -95,15 +95,15 @@ def tj_consumer(request): 
               | 
            
            
            
              | 
                95
               | 
              
                95
               | 
              
                     sale_trends = [s.data for s in sale_trends] 
               | 
            
            
            
              | 
                96
               | 
              
                96
               | 
              
                  
               | 
            
            
            
              | 
                97
               | 
              
                97
               | 
              
                     # 型号销量统计 & 热销商品榜 
               | 
            
            
            
              | 
                98
               | 
              
                
               | 
              
                -    model_sales = ConsumeModelSaleStatisticInfo.objects.filter(brand_id=brand_id, ymd=0, status=True).order_by('-num')
               | 
            
            
            
              | 
                
               | 
              
                98
               | 
              
                +    model_sales = ConsumeModelSaleStatisticInfo.objects.filter(brand_id=brand_id, ymd=ymd, status=True).order_by('-num')
               | 
            
            
            
              | 
                99
               | 
              
                99
               | 
              
                     model_sales = [m.data for m in model_sales] 
               | 
            
            
            
              | 
                100
               | 
              
                100
               | 
              
                  
               | 
            
            
            
              | 
                101
               | 
              
                101
               | 
              
                     # 经销商销量统计 & 经销商榜 
               | 
            
            
            
              | 
                102
               | 
              
                
               | 
              
                -    distributor_sales = ConsumeDistributorSaleStatisticInfo.objects.filter(brand_id=brand_id, ymd=0, status=True).order_by('-num')
               | 
            
            
            
              | 
                
               | 
              
                102
               | 
              
                +    distributor_sales = ConsumeDistributorSaleStatisticInfo.objects.filter(brand_id=brand_id, ymd=ymd, status=True).order_by('-num')
               | 
            
            
            
              | 
                103
               | 
              
                103
               | 
              
                     distributor_sales = [d.data for d in distributor_sales] 
               | 
            
            
            
              | 
                104
               | 
              
                104
               | 
              
                  
               | 
            
            
            
              | 
                105
               | 
              
                105
               | 
              
                     # 各地区实时销量 
               | 
            
            
            
              | 
                106
               | 
              
                
               | 
              
                -    province_sales = ConsumeProvinceSaleStatisticInfo.objects.filter(brand_id=brand_id, ymd=0, status=True).order_by('position')
               | 
            
            
            
              | 
                
               | 
              
                106
               | 
              
                +    province_sales = ConsumeProvinceSaleStatisticInfo.objects.filter(brand_id=brand_id, ymd=ymd, status=True).order_by('position')
               | 
            
            
            
              | 
                107
               | 
              
                107
               | 
              
                     province_sales = [p.data for p in province_sales] 
               | 
            
            
            
              | 
                108
               | 
              
                108
               | 
              
                  
               | 
            
            
            
              | 
                109
               | 
              
                109
               | 
              
                     return response(200, 'Get TJ Data Success', u'获取统计数据成功', {
               |